auto merge of #502 : alexcrichton/cargo/try-to-fix-travis, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 2 Sep 2014 22:44:09 +0000 (22:44 +0000)
committerbors <bors@rust-lang.org>
Tue, 2 Sep 2014 22:44:09 +0000 (22:44 +0000)

Trivial merge